conflict resolution
fixed merge conflict