removed conflicts in main