removed commented code
fix merge conflict