Attempted to fix conflicts in pops commited code