made some changes to force conflict