Merged changes on local machine.