Add some whitespace
Solve merge conflicts
Update submodule
Streamline build attribute method