BUG: Fixed merge conflict