Jekyll serving
conflicts removed