angular stuff we dont have to keep
merge