Merge conflict fix try 2