merging from app