remove merging conflict.