cleaned up comments
fixed conflict