trying some fixes for mergeconflictower