fixed broken merge changes