Test merge changes