Fixed error caused by merges