merge conflict and button styling