all conflicts fixed