merging before server implementation
Resolving conflicts