Fixed failed merging (removed "<<<<<<< HEAD" and ">>>>>>> upstream/pre-master" lines)