fixed "broken" commit due to unresolved conflicts