added convenience functions, removed auto-format
removed conflicts