Trying to solve conflicts with master