removed merge conflict

latest