fix merging conflict