Merged changes manually