Markup file + remote changes