constant fix
merge error fix