initial merge for mp