Clear conflict left over