Fixed more conflicts