Fixed conflict merges that disappeared