merge & code quality