updated without pulling from remote
merged conflicts