removed unwanted merge codes