Removed merge mistake