Adds other param files
resolve merge conflicts