adding own rc file + merge