fix comflicts