resolved conflicts and merged changes