merging my changes into master branch of main app