Added all changes lost in merge reset