Fixed failed merging

Removed "<<<<<<< HEAD" and ">>>>>>> upstream/pre-m...aster" lines to fix failed merging.