modelines for vim
whitespace for readability
testing for conflicts