merge changes flyapen