Removed git conflict markers that seems to have been introduced from merge with angular branch a while back.