Fixed update conflicts