fixed bug that comes after merge