Prevent future unnecessary merge conflicts
Signed-off-by: NJason Cooper <jason@lakedaemon.net>