+merge all changes