Manual merge of SVN changes