modified some pre merge checks and comments