pre merge changes