Fixed conflicts and merged