fixed comflicts