fixing merge reset