deleted old merge files
package 'server' is more or less ready for a test run!