Fixed commit that had merge conflict stuff in it :-/