fixed bugs and added conflict resolution
small change
completed merge