Fixed merge conflict. #857
Code formatting. #857