basic angular app
merging