Removed file to solve merge conflict