Added all changes lost in merge reset
5 files changed