we merged both apps