Fixed conflicts and merged master