Removed someones merge conflict