merge in changes made resolving conflicts in shared repo