Modify angular models
resolve merge conflict