Cleaned some SVN conflict problems