Fix for merge fail and commented some code