Fix conflict key